Dev patrick

From Patrick !! Waiting for approval.