merged live and fps changes