Adding some stuff from my side