removed unnecessary
added for as generation