Change format, make it work