Merged some layabout changes