Change few functions