Added functionality V2

Error fixes