made work on new layout.