removed redundant and Felix's changes