Added current design (roughly)