adding some custom things, expoect more changings