updated to fit better form