added a bit more and stuff