Short tags removed, WIP