many changes
added classes