Fixed and finished syntax