New methods + updated old ones
merge