Added temp stuff for testing