Improvements. Getting closer to the final version...