Make it work for now