Little unfucked

not tested