Liron's updates for 900*900