New approach for this, Still have make things prettier