Not completly of my creation but I've added small imrpovements