some updates according to new requirements