Semifixed drawing
Fixed naming schemes