cleaned a bit - DO NOT MERGE STILL