Draw func is less janky but works
Merge branch 'Zoher'
Fixed merge conflicts