Goals clearer - starting to revamp