v0.2.2 Updated Handling of Graphics