Modified decoder for efficeancy, changes successful