Sprint 4
merged plug-it-in