Added more options
Merged with old files