Added Adin's methods