Edited for comments