added some syntax
tring to merge everything