Adding Sebastian's changes