Temporary solution to CPU intensive problem