improved & merged tonygay