Added new method.. need to test