updated with main features