Changes from seamantech and permissions