Commit 006: Change assumptions