Make it work as intended