Yeee simplified the code A BIT!