Remake proper some function