Extra curly brace fix + new orden stuff