removed commented functions...