removed copy-paste, migrated to a subview