Still moving the code in dedicated functions