EDIT some improvements