Changed back strange code modifications.