Modified form to make it more efficient