Made according IR's specs
Minor fixes