Edited some functions ...