Changes before my new tweaking