Reimplemented code to follow vector solution model