Removed most of the unneccessary stuff