first commit
added support for extras
fixed bug on extras selection