lag issue partially solved