Some edits to Andrey's fork of Sebastian