Might make sense to set this architecture dependent. What do you think?