transfered jamie's design into app