Moved computed vars at the end
Added a license