Major Changes 2

With FLock :D