more editing, still need to work on times.