Big changes in API + graphics