Made more changes to overlay module