Modified Items Controller to make it more stable