Additionally can you change rest of code to use that method too? Thanks.