change to a cleaner model