Added drop and take