Edited 16.October - Added 2 functions