added remove + testing