updated for new layout manager