powerup sockets set up
fix merge
fixed merge