Added performance markers
Fixed for real