changes to Drawable and Movable