more methods
Many updates