Updated Canvas class
Updated engine