Small changes and now it's more easy to run