edit added - bugs