My modiffications, still WIP