Implemented more production logic