Some modification from class