Big Commit

MORE CONDITIONS