Revamping it slowly..