More syntax fixed + queue implemented