updated version with front