reorganized again, animations developed a bit more