improve portability and change info in database