some Modifications