Added some concerns and refacts <3