Minor perfomance update