version with updated control