Added some more cross functionality