Reverted canvas stuff - it was messy