More work on the profile stuff