Updated. Removed use of deprecated methods...bitch