Modified. Now this one works better than the main branch one