updated for aws server