added all those things