Added more subroutines