decided to revisit my previous model, thinking on potential improvements for future models and stuff