Revamp not working yet, getting there