How would YOU rework this?