Implemented some changes that were discussed before