edited for submit