Added some A/S stuff