Actually make it work properly