+ merged with gui project