Added only one directive, another deleted, some conventional changes