Changed static to aws