Wow i needa stap. added back andrei's edits