Did some revamping