+ Replacing files with newer version

Previous version had bugs