Removed threading additions (for testing)