Drawing properly now