small changes to namings and moved sing method