Removed private and static