Major changes - as allways ^^