Added boundaries and movability