Changed few functions parameter orders