Refactoring & improving
Update
Not used anymore