minor checks implemented to prevent concurrency issues