Removed unnecessary code.
Added more temporal options