Added features with speedUp