Kept only the required stuff