Finally some work done from the airport.. yeyyy :D
Added an attribute that will make it work in reverse #1
Resolved conflicts and merged changes