Implemented a bit more