Added code to draw boxes