added all stuff