Adding some conditions for older boxen