Hopefully the last change with defines