reworked ,kicked out symfony
allround improvement