Reverted last change + signs do not seem to work...