Changes before refactoring