cleaned up version of the starterkit