Changed few things