Drawing logic
Fixed conflicts