This needs checked if the above simplification is made.