changed alot V1.1