Reimplemented overwritten changes