Commented and rearranged newly added methods