Added proper drawing