Added some #defines to simplify the code
Remove ticks