Make it work properly