Final dev-changes