Added cloud class and some more angle calculations