replaced todo with draw