Added removing and moving