Updated and double checked methods