Updated with more new subroutines