Improve f***ing design