implemented power-ups
merged