Added Small feature (Not quite finished)